2 files changed, 99 insertions, 19 deletions

diff --git a/app/[lng]/evcp/pq-criteria/[id]/page.tsx b/app/[lng]/evcp/pq-criteria/[id]/page.tsx
new file mode 100644
index 00000000..f040a0ca
--- /dev/null
+++ b/app/[lng]/evcp/pq-criteria/[id]/page.tsx
@@ -0,0 +1,81 @@
+import * as React from "react"
+import { type SearchParams } from "@/types/table"
+import { getValidFilters } from "@/lib/data-table"
+import { Skeleton } from "@/components/ui/skeleton"
+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
+import { Shell } from "@/components/shell"
+import { searchParamsCache } from "@/lib/pq/validations"
+import { getPQs } from "@/lib/pq/service"
+import { PqsTable } from "@/lib/pq/table/pq-table"
+import { ProjectSelectorWrapper } from "@/components/pq/project-select-wrapper"
+import { notFound } from "next/navigation"
+
+interface ProjectPageProps {
+  params: { id: string }
+  searchParams: Promise<SearchParams>
+}
+
+export default async function ProjectPage(props: ProjectPageProps) {
+    const resolvedParams = await props.params
+    const id = resolvedParams.id
+
+    const projectId = parseInt(id, 10)
+
+  // 유효하지 않은 projectId 확인
+  if (isNaN(projectId)) {
+    notFound()
+  }
+  
+  const searchParams = await props.searchParams
+  const search = searchParamsCache.parse(searchParams)
+  
+  // filters가 없는 경우를 처리
+  const validFilters = getValidFilters(search.filters)
+  
+  // 프로젝트별 PQ 데이터 가져오기
+  const promises = Promise.all([
+    getPQs({
+      ...search,
+      filters: validFilters,
+    }, projectId, false)
+  ])
+
+  return (
+    <Shell className="gap-2">
+      <div className="flex items-center justify-between">
+        <div>
+          <h2 className="text-2xl font-bold tracking-tight">
+            Pre-Qualification Check Sheet
+          </h2>
+          <p className="text-muted-foreground">
+            벤더 등록을 위한, 벤더가 제출할 PQ 항목을: 프로젝트별로 관리할 수 있습니다.
+          </p>
+        </div>
+        <ProjectSelectorWrapper selectedProjectId={projectId} />
+      </div>
+
+      <React.Suspense fallback={<Skeleton className="h-7 w-52" />}>
+        {/* <DateRangePicker
+            triggerSize="sm"
+            triggerClassName="ml-auto w-56 sm:w-60"
+            align="end"
+            shallow={false}
+          /> */}
+      </React.Suspense>
+      
+      <React.Suspense
+        fallback={
+          <DataTableSkeleton
+            columnCount={6}
+            searchableColumnCount={1}
+            filterableColumnCount={2}
+            cellWidths={["10rem", "40rem", "12rem", "12rem", "8rem", "8rem"]}
+            shrinkZero
+          />
+        }
+      >
+        <PqsTable promises={promises} currentProjectId={projectId}/>
+      </React.Suspense>
+    </Shell>
+  )
+}
\ No newline at end of file
diff --git a/app/[lng]/evcp/pq-criteria/page.tsx b/app/[lng]/evcp/pq-criteria/page.tsx
index d924890d..778baa93 100644
--- a/app/[lng]/evcp/pq-criteria/page.tsx
+++ b/app/[lng]/evcp/pq-criteria/page.tsx
@@ -1,14 +1,13 @@
 import * as React from "react"
 import { type SearchParams } from "@/types/table"
-
 import { getValidFilters } from "@/lib/data-table"
 import { Skeleton } from "@/components/ui/skeleton"
 import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
 import { Shell } from "@/components/shell"
-
 import { searchParamsCache } from "@/lib/pq/validations"
 import { getPQs } from "@/lib/pq/service"
 import { PqsTable } from "@/lib/pq/table/pq-table"
+import { ProjectSelectorWrapper } from "@/components/pq/project-select-wrapper"
 
 interface IndexPageProps {
   searchParams: Promise<SearchParams>
@@ -17,34 +16,33 @@ interface IndexPageProps {
 export default async function IndexPage(props: IndexPageProps) {
   const searchParams = await props.searchParams
   const search = searchParamsCache.parse(searchParams)
-
+  
+  // filters가 없는 경우를 처리
+  
   const validFilters = getValidFilters(search.filters)
 
+  // onlyGeneral: true로 설정하여 일반 PQ 항목만 가져옴
   const promises = Promise.all([
     getPQs({
       ...search,
       filters: validFilters,
-    }),
+    }, null, true)
   ])
 
   return (
     <Shell className="gap-2">
-
-      <div className="flex items-center justify-between space-y-2">
-        <div className="flex items-center justify-between space-y-2">
-          <div>
-            <h2 className="text-2xl font-bold tracking-tight">
-            Pre-Qualification Check Sheet 
-                        </h2>
-            <p className="text-muted-foreground">
-              벤더 등록을 위한, 벤더가 제출할 PQ 항목을 관리할 수 있습니다.
-       
-            </p>
-          </div>
+      <div className="flex items-center justify-between">
+        <div>
+          <h2 className="text-2xl font-bold tracking-tight">
+            Pre-Qualification Check Sheet
+          </h2>
+          <p className="text-muted-foreground">
+            벤더 등록을 위한, 벤더가 제출할 PQ 항목을 관리할 수 있습니다.
+          </p>
         </div>
+        <ProjectSelectorWrapper />
       </div>
 
-
       <React.Suspense fallback={<Skeleton className="h-7 w-52" />}>
         {/* <DateRangePicker
             triggerSize="sm"
@@ -53,6 +51,7 @@ export default async function IndexPage(props: IndexPageProps) {
             shallow={false}
           /> */}
       </React.Suspense>
+      
       <React.Suspense
         fallback={
           <DataTableSkeleton
@@ -64,8 +63,8 @@ export default async function IndexPage(props: IndexPageProps) {
           />
         }
       >
-        <PqsTable promises={promises} />
+        <PqsTable promises={promises}/>
       </React.Suspense>
     </Shell>
   )
-}
+}
\ No newline at end of file